Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:13:15 +0000 (23:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:13:15 +0000 (23:13 -0700)
commite49be9c48b8008b9a9a886b110146bd3aea9f724
treeafd670f8ba3514fa1944d22fce9fce7b408957b8
parent46be2ff4530f09ec59685b3b04da84ddc8d1fc3a
parentac422813ea1b7099c2022fc81bd4ea5a0d8b01a9
Merge from trunk.
src/ChangeLog
src/window.c
src/xdisp.c